Merge tag 'upstream/2017.1' into debian/master
authorSimon McVittie <smcv@debian.org>
Fri, 27 Jan 2017 08:58:18 +0000 (08:58 +0000)
committerSimon McVittie <smcv@debian.org>
Fri, 27 Jan 2017 08:58:18 +0000 (08:58 +0000)
Upstream version 2017.1


Trivial merge